fixing inter-subproject dependencies there got lost during the last revert