Revert "branch update from Fabi"

This reverts commit 744bdf0c7ce723aa8bd71998af1e960861b26d64.