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