Convert #149806 to Flügger