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