More in line with CM's Gingerbread branch.