Revert "Add some very rudimentary support for handling html parts"