Back out changeset d89484b7c0fa (Bug 1036781 - Part 6) to see if it burned Android 2.3 Opt.