Convert #228894 to Flügger