As discussed with Andy going to land the changes here as a different branch.