Merge "Revert "Add aliases for -nodeps targets"" into main