This reverts commit 96aa722af0. It formats things very differently. We're not going through this again.
96aa722af0