Yes, these are unrelated changes but somehow ended up being prototyped together and I'm too lazy to separate them.