Revert [1622].
Turns out that the template hierarchy works as expected. It was an issue with a wrong show_on_front option for one site.
show_on_front
see #1049.