Revert "LPS-44911 - Form Navigator generates invalid HTML"

This reverts commit 0d426e4b6b6fc232ddada88b7b5ba2b2542e8569.