Removes reliance on Cookie facade