After fixing b/16874785. This reverts commit f010a05c. Change-Id: I1645ca5d6f60595bf5d388913665ce4b8780b26d