Revert the revert 253497 and 253539 - These commits aren't the cause of the clang...