refs #1737 : reverted - backward-compatibility issues.

 -