Revert "class variable"

This reverts commit 2110499995ef09aa8963861072ac98fd670f6c22.
................................
Revert "Revert "class variable""

This reverts commit 3be513167d6282c33d4a17f72a9a9fa0468ce490.