Revert fix for #9231

This is more complicated than I thought.
Merge remote-tracking branch 'github/build-bot-2.1.x' into bleeding-edge-2.1.x
2014.08.28-07.00