Revert "Merge pull request #1041 from erikvold/882867"

This reverts commit b9d5ce9152997dd40964279daf4fbe615eb8cfd7, reversing
changes made to 1c8d49c4a4e1bff06adab1afc30f19a7eaf4a298.