revert previous commit to fix bug in v1.1.0

This should fix #452, it's basically overoptimization gone bad.