Merge "Fix use of nonexistent class variable in accounts"