Revert "Just some stuff that will soon be overwritten."