If companions are going to be in 2.0, can we get the option to switch them again before the November 11 mark?

While on the main scenario missions I saw you got to constantly change them, until you did the final mission, you couldn't enter the house anymore to change your NPC.

Can it be unlocked for now so those who are disappointed with their npc can change to something else please?