Factor out

Same logic as was used for dell-force10