As mentionned in the PR discussion, everything seems to have changed in `trunk`. Fun! ;-)