Revert r175120 and r175121. Clang is producing the expected asm names again.