reverts part of c2a6d5f1; fixes #22