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