Revert "Merge pull request #1071 from erikvold/882645"

This reverts commit b3e20357526463d2d572a42d4609121a359d62f8, reversing
changes made to da0d2ef900e99c582e464601ccc6e8eb03e9898a.