Revert 04c9c07fa23c2061d5f53a341765d5ed124e3b1a, fixes #19