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