Unbreak all the failures caused by modifying call_history