Revert "Merge pull request #1674 from erikvold/1077372"

This reverts commit f1091a4fc7c9e1f3918c367eda66b3f190e3e626, reversing
changes made to 56538e2ca6ec7d92bd304fed17fe9b860e05359a.