Remove spurious changes from the last merge.

These were accidentally included in a manual push.

@caitp, please review.