revert replication change, refs #175
Merge pull request #291 from obfuscurity/backport_revert_replication_change

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