Update to conform with Brush update 9da974e