Revert "Better way to handle HTML align"

This reverts commit 866e829e3737ef3a2b0c9c1db17c0e27b6e81c3a.
Another try to correctly handle HTML align