OCT-2921, # reverting attribute chnages