Chris noted that this was actually broken on master, but will move it into a separate patch