Broke the build. This reverts commit b4b2857236 Change-Id: I51f5f569d717bf0973e5e5a868e9fdc53ca80f99
b4b2857236