This fixes a binding loop, but introduces another less fatal one, since commit d6ed9adf. Change-Id: I67934b4cdde2efe04e20064fe41191241b0689b9 GitLab: #857