Revert "More directory cleanup."

This reverts commit 9051384f9cbb0210b4e13c419eceb3eaa4170022.