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: I1de2bf65310920b3496c58f05b3c39158de4c51d