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