This reverts commit 151b9ff0cf. Reason for revert: broke builds Change-Id: I69b3b8795d5a36b4fa0debb1af2d433be3c15d6c
151b9ff0cf