Restore check data before check rbc

#876

A bit embarrassing, but #888 *was* the right change.  Bring it back.