Speculatively revert r138809 in an attempt to fix DragonEgg.