Revert "Looks like we'll have to use the directory trick"

This reverts commit 89e293ed787c24c53d5321b8e5d4f7965e5fc2a0.