This reverts commit e0050ebd. Reason for revert: Breaks build Change-Id: I01bc218553ae6efb6140b66f035ccb129d3e5028