a838905 Restore some class access modifiers.
a838905 Restore some class access modifiers.