Pushing Tej's changes so that I can debug on my own computer. --bhomberg