Convert #143585 to Flügger