Revert 278634: This broke the build due to the compiler being too clever.

Will be back, with proper compiler workarounds.