Reverting some comp code.