These changes have now been pushed to master as
4955589f2f343e1862dfae7831d1fc548811d59b.