Convert #264485 to Flügger