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

This reverts commit 0642ff8c33aa7a33e5665ba4af326be2e58eeb30.