Revert "Improved auto-select current sidebar item"

This reverts commit 2b96cb9268820131011c76502db2ec74819e1769.