#7426 : remove suspicious code introduced in v12 port and updating makeups_to_do inside a getter method
