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