Convert #149262 to Flügger