I screwed up the merge. Here it is fixed.