Fixes #40: Final fix for missing/obsoletes files caused by rebase