tree e6a22b444fe9137b755ba670a272c8254ce22656
parent c34320d27b5360e24c36b1bdca1d3081828a64fb
author Philipp Wollermann <philwo@google.com> 1490184051 +0000
committer Yue Gan <yueg@google.com> 1490195504 +0000

Partial rollback of commit dd142c93fd4939aaec30726f275644ca9446fea2.

Should fix #2721.

--
PiperOrigin-RevId: 150866145
MOS_MIGRATED_REVID=150866145