Revert fix for #81 - it actually breaks things
2 files changed