Yeah, it wasn't so much a "this has to change for this PR to land" but more like "ugh".