I would prefer we change this to not use promises.