It's funny because they said people asked in the forums to have the functionality changed to prioritize NPCs, and that's why they changed in in the first place. XD
Either way, I hope the change back makes it for the next update, because it's annoying.