Revert "developing branch"

This reverts commit c48f02e48bdc39292727404b6cd1d74215ff2741.