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