Closes #1664 (closed) and #1669 (closed)
This will create a new commit in order to revert the existing changes.
