Is it worth using `await` here to make this more readable? cc @Haacked