Revert "CID 1187991"

Until we know more about the possible side effects

This reverts commit 0d0e29676da0e451845ca59b3a0dab14b0cdb493.