Revert ringmaster's fix. It does not make things better.
This one should fix it for real. Now both subdir subsites on subdir sites and subdir subsites on root sites work.