Merge "Fix build, removing hidden attr"