Back out broken (and redundant) generated-code debugging fix