Make missing dep errors actual errors.

Remove some commented-out code that wouldn't even work
any more if it were uncommented.

Auditors: markcc
Revert "Make missing dep errors actual errors."

This reverts commit b5f47ae1cc4b5889b8a50bfd767e7848cca275f4.
Fix scala artifact merging bug.