Convert #164759 to Flügger