This reverts commit 183f49c3. The lang/cpp/trivial_abi/TestTrivialABI.py lldb test fails on buildbots.