Revert "support: Fix build with ISO C++ 11 compilers"

This reverts commit b90c4b10e4708d2c05e05037c7c8fd4e1b7efec6.