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