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