Revert beni

Reverted merges.  Except for merge conflict.  Would not let me without doing some 'mark the corrected paths' stuff that I do not know how to do.