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