Bringing the scaffold generator up to speed so it can do its dirty work for 24.3