Revert "Merge pull request #1326 from erikvold/936623"

This reverts commit d59daa166d5da3569f92332a8a6182fe6eeaf818, reversing
changes made to 38851bf46c0950780b3b28065bfccac4451b67c1.