Reverting change made in f9aca379198b61165a7ca201bfe058313378ec5d as it breaks site selector in some cases.