Revert 51f5017. Fixes #271.