We may want to handle this via the blades instead, as I’m not sure if API users will run into weirdness here.