Revert commits to fix source-is-missing errors (does not work as expected)