FIX: Remove monkey patching