Revert "class var"

This reverts commit 9a9eb828a8eaa4657f3c696ad4193e5f6067928f.