Switch master branch form builder to extend simple form's form builder