Can you add it as a standalone commit somewhere so I can cherry pick it?