Actually, I'll remove the TODO and open a ticket to do this in develop.