[TASK] Undo changes from optimisation with bad effect