Should be superceded by the patch suggested in the remote-fetch-decorator branch.