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