Revert binder code from 3.4
Revert binder code from 3.4