WIP: Updated for Gingerbread support removal.