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