go back to using upstream now that they fixed the bug