Revert "Temporarily use fork until bug fix is merged upstream."

This reverts commit 24aa7232f74e41e1edd1f1056669e64ee2d289a9.