This reverts commit 6de3d810. Reason for revert: Build breaks. Change-Id: I66826a2037b225bd5afcf1d8934e630ab0fc4625