Convert #163441 to Flügger