Provide clean non-monkey patched version