This reverts commit 76de0a8f52. Bug 21881199. Change-Id: I53f42a1e8f25d214de97264f4d25813bc637cafa
76de0a8f52