Revert some 3af192c changes
as it leads to loosing user-specified column order