Reverting effd98be7ebaa1f6f0d2c5b524c96ed6e0839a32

this caused bug 64289; so we're going to revert this for now;
then redeploy effd98be7ebaa1f6f0d2c5b524c96ed6e0839a32
and Ib97f47ef1d66420682bd429c9c12e66c3392e77d in one of the
swats next week.

Change-Id: I6edacd32744e23133fc171b4ee846dc9e811469f