Need to update comment to reflect that this is always a promise now.