Added a TODO to remind us to remove the failsafe when refactor is done