Wire up ELB switch over to the CLI and add a CFN_ASSIST_TYPE tag to control which instances get added to the LB. Fix an issue with resources from rolled back stacks getting picked up