Revert "Fix the buildbot config". Not needed now the bot has been upgraded.

This reverts commit 356fdfc26f08190103f27a97cf7c9c3d12fa4723.