remove-extraneous-dep-on-old-mock.patch pr354.patch