Convert #170481 to Flügger