Revert "Merge pull request #13363 from dmarcos/bug934657"

This reverts commit c38d3842daa97cea360fce1af82f2d7b78134bc3, reversing
changes made to 5de94a2be6ab8d33434294d70c1de330f55d8f2d.
Merge pull request #14980 from lightsofapollo/revert-c38d3842daa97cea360fce1af82f2d7b78134bc3

Revert "Merge pull request #13363 from dmarcos/bug934657"