Replace self-closing tags
Revert "Replace self-closing tags"

This reverts commit 86f99260d4b0da5b909792b158267f6bffa33cfe.
Replace self-closing tags
Update metadata and remove type attr