This solves #902 (closed) & #903 (closed)
This will create a new commit in order to revert the existing changes.
