Refs #841426: order imports better