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