Closes #1522 (closed) #907 (closed)
This will create a new commit in order to revert the existing changes.