Revert some changes replace changes that shouldn't have been made.