Revert "Refine selection update mechanism"

This reverts commit fc560514ab9ba02860c2827866b0bcf3aeb678b3.