I've moved the default controller definition to the constructor, so we only have one now (see #808).