Revert "Merge pull request #1373 from runrevfraser/bugfix-11912"

This reverts commit b3cc1fb48362f800d11300b9b3c763d4589d94eb, reversing
changes made to d050cbebf04246292ba26b11f9ef793f747f2a7e.