Back out previous change

Needed to merge upstream changes in before creating pull request.