Revert "core: Fix build in ISO C++11 mode"

This reverts commit 3860ac13da0046a116953c42da711e0c8348f905.