[atm] drop backported patches as they cause regressions and oopses