reverting 78343314c0a1d22eb595de67a671edddcd95e8cf as e0ea14b3b66f920ebd1301fb65d5b6de516b9d50 was wrong in another way, too, refs #932