RReverted to old configuration behaviour