Revert "Merge pull request #1170 from erikvold/899630"

This reverts commit 4ee16e49c0707a3f96c0baee14d030e3d76ce820, reversing
changes made to b67f61dd359aa55695c914f57e62fd980b596238.