Bug 804745 - Part b: Fix bustage due to apparent preprocessor limitation; r=rnewman

This is a temporary fix until the variable in question is removed in bug
829881.