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