Revert r190269 to fix dragonegg failures.