Moved monkey-patches to e-ext