Revert "Make form optional so tests still pass"

This reverts commit 766fba9d1168f5e98296f9c2d65daffbc879177d.