Revert "Last Style (but no promises)"

This reverts commit d6a357bdfd5fe105e0de787ec0a18414c8aa442f.