Yep, working up an alternate PR now.