Convert #170231 to Flügger