Reverted to correct versions