Revert many code-style changes:
They’d only make it a pain to merge back.