Revert "Cleaner markup."

This reverts commit e47c640c830abf521332fec874a19e55233a718b.