tree 2a315cdf99ac83ca3ea5e31266b2260d00345a03
parent 37f7c75a71a1ad00e2d78ae5ce79f1970e7fcf3e
author Allen Lavoie <allenl@google.com> 1603331944 -0700
committer TensorFlower Gardener <gardener@tensorflow.org> 1603335490 -0700

Rolls back cl/338294004 and part of cl/338299497

PiperOrigin-RevId: 338384800
Change-Id: I7cf4d230da1a9de064552b464055ee8675aa7fa4