Merge "Undo API patch due to field pulled up to superclass." into gingerbread