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