Revert "Fix of previous commit"

This reverts commit 0577394e161a7ee52f543ba1a948331f1d080e80.
Revert "Experimental fix for #119"

This reverts commit da885ac9e27b439785e4687b3bf15354fa3a06c3.