This reverts commit c7aef6dedb. I believe it should work again since today, though I'm being a bit conservative, pushing to `staging-next` instead of `master`.
c7aef6dedb