Using the same implementation we used for parcels
This will create a new commit in order to revert the existing changes.