Revert "New style (v2.1)"

This reverts commit ed644031dbaa51d76acfb88c5a695402b394d76f.