Revert "Hack for clang"

This reverts commit a628e44e86ca399177dc6125dfbcb9f640132844.