Shift this over to a new location in contrib/, in preparation to push
this public.
Use the correct antenna configuration variable here. "diversity" just
controls whether it's on or off.

Found by:	clang