bring back some sed commands, work around a fakeroot issue, get back the correct FS23997 fix