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