Alright, just add a TODO so we don't forget that this is part of the cleanup.