Clean up unneeded use of bind()

Follows-up 90d4eef249, d3f26e6.

Change-Id: Idcbb07646a38c889ff962f10459a6ed4ad46f27b