Failures seen on go/lem. This reverts commit 97a042ec. Change-Id: I17352f6a0956d6ab95bffdfd2aa5286334cc1206