Created by: uwx
Revert commit 55400363.
#399 was an attempt to fix an issue that does not exist, therefore the code added serves no purpose. This PR removes that code.