This reverts commit f1713bc8; we were not using the patched repo, sadly. The patching procedure is actually necessary