Removed monkey-patch (unneeded with 2.0?), fixes #active?