Convert #355381 to Flügger