23fa8b3
Further attempts to fix #251645. It's still somewhat broken, but less so than in its current state.