Issue #2213717: Port subdirs to D7.