undid merge
Revert "Merge branch 'CliffsBranch' into devel"

This reverts commit 3786a1c23d7978f2eacb670b11b99d92c6c97217, reversing
changes made to f91de52370f130f6e5836088ba8ee88cce9e1627.