This reverts commit 817a47fa. Reason for revert: Breaks build. Change-Id: I51a38e47186f778b4c1c119e9f21a5d5a1b786a8