This deals with one of the specific issues raised in #922, but doesn’t
address the general issue.