Kill horrible changes I made with bad merge...

Bad merge blew away all of the browser changes that we made. To fix, I pulled a branch based on commit 9dc303d, which was the last commit with all good changes.