Revert 9652d00 to compile with GCC