Revert "Merge branch 'Rem-2564' into 'master'"

Description

Reverting Rem-2564

Motivation and Context

When working on another issue I noticed there are cases where this can cause a crash. If the connection is started with the lowest color depth it cannot be raised to a higher one, although if it starts with the highest value it can be lowered and then raised again with no issue. Reverting the merge until the edge cases are handled.