Merge "Revert "Include module dependencies under `data`""