Comment 5 for bug 1288947

Chris had a better idea. This problem doesn't exist with our ci-train jenkins. So we can just revert the change we made a couple of days ago and use that jenkins charm instead. This should prevent dumb hacks like i suggested above.