Default to not decorating forms

This is related to #2905, but does not solve the underlying issue.