This reverts commit f609354d60a68afecf94e0eca72b21dc1e0c58db. Change-Id: I6d48c93fdb4900632a938352553ee8cdde5b0e49