Revert commit cef58be224fba0b0758540f388b959f3ed30831b

Change-Id: I69a41c33a4c1016fbe72d321b9b159d9519db5b1