3.0 - Re-implement fixtures in directories.

The changes done in #3005 were lost in a merge conflict between 2.x and
3.0. This re-implements those changes.