Revert commit 145449 (ddunbar) since it is breaking the dragonegg buildbots.