Global Variables not substituted in Perforce Repository Configuration

With Bamboo 1.2 we used to define a global variable "perforcePort" to use in the "Port:" field for our Plan's repository configurations. We have two available perforce servers (main and a mirror). We've had stability issues with the mirror, and occasionally need to switch back to the main server. Having a single point of configuration (via the global variable) was useful.

Our port fields look like this: "${bamboo.perforcePort}".

Since upgrading to Bamboo 2.0 the variable no longer appears to be substituted before code changes are detected.

I've attached the relevant log.

Individually switching all of our build plans back and forth between servers is not fun, and error-prone.