This interfered with the autoconf variable of the same name, breaking
pre-release builds.

(cherry picked from commit 15dca847)
(cherry picked from commit 3e55edd9)