Follow-up to b54ef5bc for Drupal 6 core driver.