Reverted commit 9795d68

see #181