Revert "come back to new style"

This reverts commit 5f54b6deb96a99307a18452fdcf4448dd12bf492.