Revert the rest of r192749 to bring back the buildbot. These two
error messages should not be able to occur at the same time.