Conditionally use notify_sent
Backed out changeset 6f298e7960ba
Backout some recent changes

We'll try another strategy.
Backout a56c0083508e
Backout 5a8c2ebc869d
Backout eb28442a9cd3
Backout 5bbe6d4f364f