Revert "Merge pull request #750 from wbamberg/808074"

This reverts commit 78a6e6a3d8902867daaafddf3d0b7257093646fb, reversing
changes made to bfa162bc8410f8349b55993328fe32568015d370.