This patch completes the change introduced in r566 (trunk) and r568 (branch-1.2). Reviewed-by: imsnah