Revert "Merge pull request #1237 from erikvold/910647"

This reverts commit 6062af58392f990d843d74c60ad02675e39661ec, reversing
changes made to 7bd1db05c4c2218eb60bb30c50adabcf8f252256.