Revert "More paths."

This reverts commit ac28d1c25b353ff1b0a52bbf23a185e5369e27a8.
Revert "Cope with more build changes"

This reverts commit 98e2e31ea6cc45d691776891542ffa97b0249722.