Recommit r251680 (also need to update clang test)