Is this still required now that we re-render the form template?