Reverting some accidental local changes