Cleanup: Revert unneccessary change from pull request