This reverts commit 7a863b4bda. bug 11325212 Change-Id: I8b50aec4ae39894a854583a74bda4db3445d3d67
7a863b4bda