I wonder if we should try to avoid relying on automatic promise resolution given that in 1.2 they removed it but provided a backport.