Get rid of cattr_accessor

Change-Id: I7f73345bbaf4c80578d54ec5150a613e427ea160