- May be related to #1215 but was unable to reproduce the issue
  before nor after the changes.

refs #1215 @2h