Revert "revert MAX_SBAR_FIELDS"

This reverts commit 7665b434eb9f88d496c38855fb1a5cd23cc139bb.