Switch to wrapper instead of monkey patch