LPS-49307 use the short form because we don't really need the unbind