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

This reverts commit dae3ae7905ff41adb05f23aafbb63baf3523b7bf.