This change should be conditional rather than apply to all across the board.