Revert "develop remains as devel branch"

This reverts commit 53dc52cf4b85d89b3b232122029fc2c7a0c8ff13.