Backtrack on some recent changes so can then fix problem in replication.