I'd be happy with a repair all option for yourself, still requiring the gear swap though.