Revert "Issue #3461309 by annmarysruthy, charlliequadros, sivaji_ganesh_jojodae, smustgrave, mstrelan: Refactor FormTestClickedButtonForm::buildForm" This reverts commit 8c33fb4f.