Revert "[Form] Fix #9325"

This reverts commit d945ba2baf53ed00ee1ac7d3033c3616b01d0f5a.