Temporarily remove bindings that were causing the bug in previous commit