Revert commit a38b3ce since it's no longer needed