back out some of the non-working code so this commit actually works as checked out