Changes to Eye Dropper Tool

I'm assuming this is not a bug, but a change to a core behavior, one of many that Adobe seems to have been making the last few years that create headaches for me and send me off reconsidering alternative software again. I've been using Photoshop for about 30 years though, and I just wish that new behaviors didn't replace old ones. Add features, that's fine. But the last couple of years I have to keep changing up my work flow and it's a hassle.

Tonight, I found out that the eye dropper tool changes a shape layer's color by just selecting a color with it. In the past, if I wanted to change the shape's color I would double click it and then select a color. But a lot of times, I just want to change the foreground color for various reasons, and now I apparently have to first make sure I don't have a shape layer selected before trying to use a tool that is not specific to shapes. The eye dropper tool should, by default, just be selecting colors, as it always has. Or at least, have some way to revert this change in the settings.