Revert "Merge pull request #1209 from erikvold/906905"

This reverts commit 7fbdcb6126a4db2274aa7762b52bcd0879c09106, reversing
changes made to d7add61018b62db5c944c024c053c9a8944e9b71.