I believe 80c0b416 is not required anymore. What do we do about this?
This is hard to test in our CI, because we're always running as just one user.