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