revert to 985b0d4c5e
fixing all the bullshit that broke it previously.