(cherry picked from commit e1b09199)
This will create a new commit in order to revert the existing changes.