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