Revert my r181563, breaks tests on buildbots