roll back to pre-May 29 setup

as complex as it is, it is nice to have everything self-contained and
easy to drop onto any system