Removed the clang workaround