Reverting somewhat for now.