Rewind 2 changes from 28700f5.

The checks were not redundant, but referred to different users.