This reverts commit fb4894429810776ae1d2d812872d3158e4d9eb92. Change-Id: I205904bf9be8149cda0b9aeda68948f14b5d64fb