revert 8947bbf071ccff767c0e65234d547984fc97cdc4
refs #1254