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