Add it all back, with clean source