It turned out that all fix attempts since 2a90af6d were not quite addressing the root cause of the problem, and only trying to fix its symptoms. See 2ac79eae for details.