Messed up some branches. Gitlab handles rebase thingies in a strange way. Need to check this. This reverts commit 686efef1.
