Re-apply change 353dcfd307853da289fdd245410e2e07358624a0 by Friedemann Kleint