Revert "Merge pull request #1182 from erikvold/865391"

This reverts commit 1ab0df2193e9b5cfb9ef7b0699e586c4abee1bed, reversing
changes made to bd177f2c7773c3dfd7ae77f0069b32ed961f2022.