This reverts commit e39da8ab. This depends on a change that needs additional design review and needs to be reverted.