Bug 1060524 - Eliminate pre-Gingerbread code.