Revert "merge"

This reverts commit 3a7e2cd81de0515cec7ea236325328ef0abc3df2, reversing
changes made to bab31fb18e6e6278eb7fd9f1a79ba2d72215a634.

Ausversehen den FamilyTree rausgeschmissen :)