Revert "binder: fixup"

This reverts commit efafd9a647d06f94eeff2984f43ccea4ff9e32d8.