Work around a generate bug for a bit

This is not solving the problem but it moves us forward for now.