We don't need this delegation and can be setting directly to the right
object.

Also document the new configuration.