Revert "Clean up more pieces of the Everything::HTML space"

This reverts commit e1b7d8ecd4cfcb8ee285936ec29e0ca02ec7508f.