Refs #9933.  Made to support workspace without instrument better.