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