Revert "Hopefully this fixes things building with Clang."

This reverts commit d84004252bf55f949283f2cb7e87b1590442a35f.