Reverting some reverts