i'm not too worried about unreverting the change. it explicitly moved things to a separate file so hopefully won't be hard to rebase. and i expected something like this -- will just add a test once i figure out the fix