Revert "Merge pull request #1562 from erikvold/1042967"

This reverts commit 4b3868f7f03650388e162970438a7261591531c3, reversing
changes made to 80391cda74f95f03ec624bdca45a336ec24a96d9.