Revert 3b88617 - fixes #187