Revert 8e992e4 and instead bump RULE_BUFFER_SIZE in params.h by 4. We should
look into this more closely but this will do for now.