Merge "Revert "Death to synchronous transactions (1/2)"" into nyc-dev