Bug 10769282 Reverting temporary patch required for factory rom. This reverts commit 292fd0351be8f414cbe32a7eb322bd18158685d9.