Re-enabled fix from r48834, to suit GCC version on Staf's new nightly build