This reverts commit 46589c49.

Reason for revert: <Compilation failure due to missing dependencies>

Change-Id: I7eba5f81b5eba7130c2f1f15645628facc00493a