Fix for 'Force backward compatible SERVER_SOFTWARE'.