Fix after spy when mp is not mocked
(cherry-picked from c609c91)