This depends on #1691. We should deprecate this as soon as we have ported the documentation and the tutorial to the new syntax.