I surrender - this code is just too interbred with other components for me to clean up, so turn it off for now
Revert r30600, r30602-30604 as the first one broke the tarball and the others couldn't fix it