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