Merge commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea' * commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea': Undo API patch due to field pulled up to superclass.
Merge commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea' * commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea': Undo API patch due to field pulled up to superclass.