Revert "Update to hopefully fix issues compiling under GCC"

This reverts commit b9cef5c46ba2557697406950faaf70a46dcb1760.