Raise/Remove 20-Field Limit on Inquiry Forms

I'd like to migrate a visit day registration form to an Inquiry Form instead of a General Form so we can have more functionality with contacting new leads from the form. However, the 20-field limit on the Inquiry Form won't let me include everything I need on the registration form. Can you raise or remove the field limit?