Revert 7fcd7d3dae7; fixes #3.