Revert "GCC-4.8+ Build Fix"

This reverts commit 96ab8df6199346665e7dfa397ba7afcf60c9544c.