Bug 12489442 This reverts commit 7fe03a267e. Change-Id: Idf434d79683e170364838388c7933a8591f7f4d3
7fe03a267e