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