This section keeps reappearing in master for some reason.   These bits are now obsolete.