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