revert HTML wrapper refactor