Reverts from core.promises.* to core.data.*