Revert "Added changes for reverting"

This reverts commit 04e45adb83e3825970620d9f5cd1402a16be7f82.
Adding changes for amending afterwards
Finally amending