Revert "Merge branch 'html' into merge"

This reverts commit 94ac13893b32dac1fba571d8b85114b57d24e4aa, reversing
changes made to 3f7eaed2558a40278bca88e2c1c28875e95a2f2d.
Revert "Merge branch 'html' into merge"

This reverts commit 92da8679bb48f89ffa0e30f3254a0e320974c6e0, reversing
changes made to bfabc607aa9bdf2e1d6532bc45326abd72ace15c.
Revert "Merge branch 'html' into merge"

This reverts commit bfabc607aa9bdf2e1d6532bc45326abd72ace15c, reversing
changes made to f64e8ea87917648c7fbd2e49e8e46df742554100.