Revert "fixing form class conflict"

This reverts commit 046daa2a67e34611493e025aa24ba058c8d7c7cd.