Fixed ticket 2672 by applying (and slightly modifying
the attached patch. The page now seems to validate correctly.