Revert "Fix"

This reverts commit 5d64d35f42b5a08746f20ee2b2e822affffe53ef.
Revert "Merged latest Collabtive-Commits with this fork's commits"

This reverts commit 3ce73ad874fd5ebe8530afe54cb8c6528eea71d0, reversing
changes made to 2f07a195160c7a9dd5d585799e7aaf24b6c5f1a3.