Changing this will break analytics from before the change to after. @mulby @stroilova, can you guys weigh in?