Looks like a WIP change that should be in another patch.