Back out 1b54c653b59c99181301a3b09e063f1e5f2b2078 for build bustage.
Switching the confvar breaks the build; why is it still there if so? -> research