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