Revert replication change, backport to 0.9.x, refs #175

refs #289