Revert breaking changes (for CM10.1).