Feel free to do it in a separate PR if this is blocking anything. I can ack.