Revert "New style"

This reverts commit 87b971a35602207194b4ad51c4d2ce3023d935c5.