Revert "Fixes #227, closes #224 and fixes #228"

This reverts commit e3c54c58b47ee390276a1350f129d811012a0816.