This reverts commit cdfc99bd55c0dd8241f3260251b4f6dbb80b3772. Change-Id: I8569984c7013321052cd1d1c02f17c606d26fde3