partial reversal of commit 698d42d8e722c2d428ee509717a985b1e2fe56c2

refs #4