Revert r141605 as it broke tests for llvm-nm.