Remove debug code that crept in with the previous "fix"