Closes #521 (closed), #512 (closed).
This will create a new commit in order to revert the existing changes.
