Fontenot's return will force tough roster move