Reverting by hand some items so that things are clean for most users