Dropping pre-ICS support