What the title says. Previous code is commented out for reference (to be removed later). Please test.
This will create a new commit in order to revert the existing changes.
