reverting dd802ce43eb6b1f7b20221e6af58fa855063b185 as 24d3c4378be91aa00365e3274e3c15739ba32974 was wrong in another way, too, refs #850