Undid changes from last few commits

They seemed to mess more things up than they fixed...