Undoing potential fix for #20. There is now better solution.
Merge branch 'revert-20'