Remove folder column after disabling multifolder scope (#1490022)