Issue 20865: Reverted unnecessary changes to picker