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

This reverts commit 1624f1d0943904f104fa5e88f1b02dfbb7df3a73.