Backport pbulk fix.