How could it ever be that instruments is not defined here? Also it's going to conflict with #2255 which I just merged.