Speculatively fix GCC 4.7 build after r219938