This (partially) reverts commit dfdb1f2680
dfdb1f2680
The directories are not that different now. Also, clean up .bazelrc