2700da5f got reverted in aa495214. This reverts commit 9239cde3. Also revert follow-up "[gn] Fix case of directory I added in 9239cde3" This reverts commit 4de67143.