[Yujun] Reverted the refactoring of Browser.