(cherry picked from commit cf48e8eb)
Closes #1423 (closed)
This will create a new commit in order to revert the existing changes.
