This reverts commit 8ace610a. (cherry picked from commit 80c563ba) Change-Id: I5b312f41d8b96eb189ea8b9d3a3ab861c5c9d515