Attempts to resolve wordLimit not working (5a8c2a0)

Could you test this and see if this will fix what was originally commented out at 5a8c2a0?

Seems to be working for me (wordLimit at least) but I haven't tested this extensively.