Strip some debugging
Fix a leftover from the earlier merges; building should work now.