Revert "Merge pull request #1714 from erikvold/1098946"

This reverts commit f1fed2c95c877d195f416c4f02517345f975255b, reversing
changes made to 240f5de953bf4b09d9ef2497d4bc23bd49415b40.