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