This reverts merge request !71 (merged). It's causing all sorts of problems.
This will create a new commit in order to revert the existing changes.
