Revert previous change.

This change caused entries with ingested flavors to get stuck on status
converting. SUP-1240.