Created by: kkirsche
Psuedo-fix: #17209 (closed)
This addresses the easiest cause of it. Separating this makes it harder to accidentally end up there. Could argue though that it solves a symptom of the problem of using separate sites for everything.
Example:
