Revert "Fix link error with GCC 4.8"

This reverts commit 041f69aba1925801aab608823cee36ab5b9ae60b.