Configure: reimplement commit#21695.