Bad hacks to get htstub running.  Will Fix (tm).