This reverts commit 941133aae9377418760cc1f7e86bc176b79b93dc. This patch is not present in the nightly tarballs we use for snapshot builds.