I just tried removing this, as you suggested, in 36cffa0. In combination with the `satisfied_by = None` change in 5b62075, it seems to work!