Revert change that broke accessor listing.
Merge branch '4.0'