Revert some more now unnecessary changes