Should provide better debuggability in self-hosting cases like #4862 but also on the production server.
