Revert r201622 and r201608.

This causes the LLVMgold plugin to segfault. More information on the
replies to r201608.