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