1d9f190374
This reverts commit 45abe7cb15.
It turns out some temporal-related work needs doing before beta can be
deployed