Convert #264618 to Flügger