I pushed the attached patch to fix this.