Revert changes to Pair.java -- still needed in pro code.