Revert "Optimized repo imports"

This reverts commit ea8d22bcc5dddd7fe533295790bf7b7b7a19f6d4.

Change-Id: I4ba5932a531cc2207603a70b74508c605d9318c8