Revert "testing branching" in devel

This reverts commit 1bed1bc2707ef72529d8569b37253b1e797e190f.