Stop using #fetch here for now, it just breaks tests