Revert accidentally-committed stuff in pot/merge.