Undo favourite optimisation :(