backport new monkey patches