Back-port of Volkers fix.