IFAIK this limit is now removed in Raven 2 so perhaps we can remove this?

It wouldn't be backwards compat though