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