Revert "Merge branch 'Rogi'"

This reverts commit 09a2afe9da425f95c69f8ea31879726d1e1d20cd.
Revert 09a2afe..56eed71

This rolls back to commit 09a2afe9da425f95c69f8ea31879726d1e1d20cd.