Merge backing out the condense work Gary did. I hope I didn't botch anything
in this merge...