Restore needed stuff. Ahem, @stefanpenner