Revert "Actually prefer promises", can't use them easily here

This reverts commit d5286ab38b7f9ef906cbf21e8b1de862736c32c0.