Remove spurious changes from the last merge.

These were accidentally included in a manual push.
Merge pull request #394 from rillian/util-backout

Remove spurious changes from the last merge.