Subdirectory test
Revert 9caff0b..c098390

This rolls back to commit 9caff0b13f9654a2da0c0b04677968e859452f7d.