@pnkfelix OK, now that #8978 has landed I'll rebase this.  Thanks.