Add back @dylex's binding groups change.