Reverting some recent changes.