This reverts commit 83f65121f8. Depends-On: I0ceace61899d0b1bd047e5011acaddd4428c944e Reason for revert: Try and get to the bottom of the problem here. Change-Id: I65b9f5a2bcd27415b61cd56f35f096d3bb2b1145
83f65121f8