Revert "More updates for form helper"

This reverts commit d0d4ba196b2f5098c234ce93bf3fea1e8738b7a8.