Revert "Experimenting with arrow-less style"

This reverts commit b02a29ef27a52b7af9225a3fff0774c27c845312.