reverting 8049fef4bc919432f818758a58186fa78e9c0d9b, was bad, refs #765