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