This reverts commit c48b8785efb6ad1103b50d53130476b82c62824d. Change-Id: I31f53bf893bd60834a608b48205843861efc5430