fix all known regressions with sed and also make it simpler
2 files changed