Merge "Revert "Move runtime/ to ClassAccessor""