This appears to fully resolve the problem described in the PR, even though one might think it wouldn't.