Replace some stuff that was overwritten in the previous commit.