reverted experimental bind/unbind optimization