This reverts commit c8164d0276 and 43f6dad234 because it breaks TestDyldTrieSymbols.py on GreenDragon.
c8164d0276
43f6dad234