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