Work on #195 (closed)
Still need to understand what the heck happens here.
This will create a new commit in order to revert the existing changes.
