This reverts commit fe0df4579cd091caa49a5a0a14bc3b3d93bcd1a4. Change-Id: I017f27ad1e8833465d6727118019b78ade4c04d6