Still failing on the bots. This reverts commit fb185130. Change-Id: I1629e237dd41ce4784ccadbfc346352dfcbdb137