This reverts commit 512a98e7. We'll need some time to migrate some internal usages off this. Will sync up with @hctim and @vitalybuka directly.