Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" See merge request !710
mentioned in commit bab4d3d0
mentioned in commit b3a6bec1