BUG-7033: Remove payload replication short-circuits

No match.