Rework controller to use whatever controller it has replaced as the structure to add the translate form to. #3480861
Closes #3480861