Revert "CLeanup of mixed mode accessors and field annotations. - Pick one!"

This reverts commit b6ed2e83d76e705d1dc79e83448fbbc4c725f606.