This reverts commit 258670842df836197231ad55381e058db43eccd2. Change-Id: I85dc6237e84d148483baf08a1508e05f9d27f65b