[Philip] Revert back to promises