Reverting some work.