This reverts commit 94a85f663694e1869acb1c2e8a3c374a6fa3ab86 There is a smoke test failure for Prime but Crespo/Stingray are fine. Will revert the change for now until further investigation is made.
Change-Id: I4da6b23cdbce89445f1ca5d2fadeb23345ce694c
Change-Id: I83d7395634eea8cb28c2fcf86c6855bb17f9fabb Signed-off-by: Nick Pelly <npelly@google.com>