Revert "Back out OT merge. Causes bugs downstream."
Revert "Back out OT merge. Causes bugs downstream."

Turns out, merging worked just fine.

This reverts commit 3362565123214afe161f27470ca185e11b3196c8.

kriskowal/frb