Fixes #4781 - Update to use dynamic bindings