Revert "binder:Backport from CAF 3.4.0"

This reverts commit a3086a7e3df0a6a8efa8d0ae5158220f4b8478fa.