Convert #187623 to Flügger