Backport to Drupal 6.

Signed-off-by: shaisachs <ssachs@ngpvan.com>