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

This reverts commit e6360c9b21258e1c85b6cef02c0c0bc5cd991653.