Revert "new style"

This reverts commit ec2f577603fc1fb69ee8dde865a63b4f5bd2d8ea.