Reverted change made in 4b472b856edc962b70ca4da5942315f8440af98e. Not because the change wasn't a good idea, but because it should be in a separate pull request.