Merge "Revert visibility change to HTMLForm $typeMappings"