Reverting some modifications