Doh!  Back out r28590 (accidentally committed the wrong patch for #3618).

Refs #3618.
Commit the ''right'' patch from #3618 this time.

Refs #3618.