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

This reverts commit 46dc2c74779d25815d0b0d4295a46e85f7628eb7.